It's a start
Now quite fleshy
Merge branch 'feature/core' into develop