safety push, still working on the combat logic