converting to v2 - Step 1
Merge pull request #5 from System-Work/Core-engine

converting to v2 - Step 1