Merge branch 'feature/Forms' into develop
Merge branch 'feature/Forms' into develop
Adding core diagram
Minor tweaks and cleaning up