Dev refactor #62

Closed jimmyeao closed 4 months ago