Adding GPS, and socket