Work on mapVM to add services and layers