Switched ECS to my new improved ECS! Time to get it working