Actually commit working registry lookup code...