-removed a bunch of dao stuff we no longer needed
-added graffiti type to get all marker map query
-many todo's
-broken tests
-BUT CRAZY MAN, CRAZY