First pass at working in GUI
Merged conflicts with Jeff's changes