Scrapped most of the registry implementation and..

started to include the reference object.