yak shaving
make OIDs abstract