Began refactoring & moving to jQuery