began adding logic for structures and units