final commit before we move towards the deeper redesign