Iterative cleaning up
Changing how MVC data get passed around