Updated with new views to work on.