Add classes inplementation
Fix and implementations
Merge remote-tracking branch 'origin/app-design' into app-classes
Delete old or empty files
Merge remote-tracking branch 'origin/app-design' into app-classes
Merge remote-tracking branch 'origin/app-design' into app-classes
Merge remote-tracking branch 'HoneyPot/app-classes' into app-design