Basic attack moves
refactoring
some changes