Fixes, prep for nesting context, refer to context