Cleaned up the code, added more tests, and added a method to return the user to the welcome screen..