Add basic entity support
Started cleaning up code
Add very basic inventory support
Merge remote-tracking branch 'origin/master'