Finsihed all the combat techs, now just a matter of writing tests, which I will do in the morning