diff --git a/inc/gps.h b/inc/gps.h
--- a/inc/gps.h
+++ b/inc/gps.h
@@ -40,32 +40,20 @@ enum gps_state
     GPS_STATE_NOFIX
 };
 
-// Messages (REMOVEME?)
-#define GGA_MESSAGE
-#define RMC_MESSAGE
-#define UKN_MESSAGE
+
+void gps_init();
+
+void gps_update_position();
+void gps_update_time(uint8_t* hour, uint8_t* minute, uint8_t* second);
+void gps_check_lock(uint8_t* lock, uint8_t* sats);
+uint8_t gps_check_nav(void);
+
 
 void gps_poweron(void);
 void gps_poweroff(void);
-void gps_init(void);
-void gps_sendubx(uint8_t* data, uint8_t size);
-char* get_longitudeTrimmed(void);
-char* get_longitudeLSBs(void);
-char* get_latitudeTrimmed(void);
-char* get_latitudeLSBs(void);
-char* get_timestamp(void);
-char* get_gpsaltitude(void);
-char* get_speedKnots(void);
-char* get_course(void);
-char* get_hdop(void);
-uint16_t get_hdop_int_tenths(void);
-char* get_sv(void);
-char* get_dayofmonth(void);
-uint8_t gps_hasfix(void);
-void gps_process(void);
+
+void gps_acquirefix(void);
 uint8_t gps_getstate(void);
-void gps_acquirefix(void);
-void parse_gps_transmission(void);
-void XORbyteWithChecksum(uint8_t byte);
+
 
 #endif /* GPS_H_ */