- refactor Attack model to use Point / Location