changes to the views, wip