finished iteration 2/wrapped everything into MVC structure