Work in progress..

Compiles

Todo:
-Controller
-View
-Activity
Merge remote-tracking branch 'origin/modelRework' into modelRework