Add a todo
cleanup of collisions and Ent code