More work.
Merge branch 'track-entity' of github.com:Gizra/zariz into track-entity