Beginnings of a GUI
Improvements