Finished pass one of Shape and Style classes