Last commit before trying out simpler interface
Resuming work on GUI