Basic combat working - but lots of bugs remain