Still working on MVC implementation, have buttons working