Model: Changed the Methods to get and set data.
GUI: Added "basics" for gui
Merge remote-tracking branch 'origin/model'