model separation
Merge branch 'dev-refactoring' of github.com:DeShir/scale-r into dev-refactoring
diaries now