Work in progress: Add some new stuff to check the user input in the Setup Activity