#21 Put into MVC pattern