Completed basic GUI
Merge 9/11/14