commit before changing entity system
commit before changing entity system
started on simplified entity system