Emc BaaS

fixes #18
fixes #19
fixes #20

Initial prep for EMC BaaS work.