Refactor and refine current logic #16

Closed tranbrandon773 closed 4 months ago