Started added enemy checking
merge movecalc