Dev refactor #54

Closed jimmyeao closed 3 months ago