Additions and cleanup

Removed the mapper aware

Hydrators can now have a strategy

setId no longer accepts null

Made a start with an entity proxy, need to be made future proof