Module 2 implementations
Merge branch 'feature-initialLayout' into develop