Adding maximum distance calculation to null
Removed a few recent changes in code
Added new file not finished debugging yet