added Luke and Danielle's GUI work