Some tweaks on structure and the beginnings of obj
creation.