Removing the view model to make the datamagic bit a bit clearer