Added some more views. Still need to work on datastore.