Refactor for intent
Fix rounding errors
Finish Distance (almost)