working on moar combatz