Second Commit

Allows the user to choose the application mode.