Hacked together support for new entity system in Zeroth