Make services direct references and match properties for I/O#238
Merged
twyatt merged 5 commits intomainfrom twyatt/profileFeb 4, 2022
+653-632
services direct references and match properties for I/O#238