Initial new design commit
New architecture initial commit
Merge branch 'feature/phpspec-newlogic' into develop