better entity system in place