cleaned up the code a little. added in a data model, ready for gps now