Latest updates from group project, no GUI due to bug-- SUMMER