Removing stages 6 and 7 - need to re-architect them. Oops