Initial work on MVC solution to GPS 3.1