Finalized GPS integration into code base