A whole mess of classes and timbre work