Wip on entity system