Made progress on GUI