Code passes e>1 tests
Good to merge with master, then work on GUI