Made modifications to the structure. Added methods for GUI