lots of changes to classes, still getting linkig errors, but fewer compile errors. Pixel updated. Currently moving shape structures to classes