added the beginnings of world stuff+code cleaning