WIP:afs-service-commit