Milestone 3.1

Almost there, GUI in progress...