Finished bonus and converted to MVC