User interface

This is a pull request for Joe's updated userInterface. This will add his branch to the master/development branch.