Refactored views and applied to all views. Still need to clean up anything setting .data directly (should be parentData, or set data$ on the context)