added some TODOs to registry.ml