Feature/map service

Yeah, ok.  Not doing anything with it yet.