Added a second stage and support for moving between stages