initial infrastruture to support #64 -- better singleton support