WIP: Move to JS and Refactoring
WIP: Move to JS and Refactoring