Dev refactor #46

Closed jimmyeao closed 6 months ago