Cleaning

Cleaned up a lot of the code.  Added all the code to the button press.