Merge pull request #23 from NicerHugs/master

comments about deferred stuff
Organizes JS code
Merge pull request #24 from slkennedy/sara-master

Organizes JS code