Adding the ability to exit and go back
Some changes to make the package build.
Opps missed in the last commit