More progress on enhancements - 7/16

Worked on Service updates for enhancements — tests not passing yet, not
all methods implemented