[INTIAL COMMIT]
[REFACTOR]