Features to the stages

Lots of stuff...