Worked on the GUI + properties