#4 core implemented
Merge branch 'feature/4-core-implementation' into dev