WIP on Model-View separation.