Update views to be able to pull directly from the database, some work still in progress