Made a more organised experimental entity system