js overhaul
Merge pull request #2 from eastcoastsb/master

js overhaul