Update 3/17/14

Working main GUI