Rework of the way objects are created, and the beginnings of combat