Begin refactoring
Continue refactoring
Refactor JavaScript to be more object oriented