Cleaned up code for GUI
Preparing interfaces to do work