My side of combat is ready. Did some refactoring.

The function call is the grid behavior class. Send me a message if I need to do more.