Starting refactor for stage views