Complete refactor to start doing things the way I want them done (more
Backbone-ish and more organized).  Added the beginning of tests.