Tiny cleanup
[UNFINISHED] Implement entities in chunk