Started adding Context::Render