first.5 step towards universalizing this repo