Merge the Entity class into the workspace.

[skaupper]

The Entity class has already worked for older versions.

Merge it back into the main workspace and write tests for it!