More functionality, redo of GUI