added working Dimension structure
Merge branch 'dimension' into develop
trivial conflict resolution