Lots of GUI work. #40