Changed to proper MVC structure, Part 2 "Electric Boogaloo"