new file
Many changes.  Decouple working code and gui