Slight reworking of high level objects for better modularity. Entity class needs more work.
Merge remote-tracking branch 'refs/remotes/origin/master'