started working on enums/base classes ...
Merge branch 'master' into development