Shammeless untested commit to master

This builds but might fail. It build the initial dependency map
from the metadata.