Implemented movment calculations
Dealt with conflict