Controller Updates

HAHA!  I broke everything in the controller because inheritance in JS
works NOTHING like other OO-languages!  This is why we have a test
suite!  Whatever!  I'll try fixing it next week or something!