Initial commit of progress - most of GUI working