Added more functions and improved haversine
Finalized and improved the two modules for phase1. Proceeding to phase 2