Work on GUI is finished for now