major changes including inclusion of views context and updates to view