Refactored Movement Context into a smarter interface
preliminary combat work