Add BasePitchClass and refactor the various things that were trying to be it :-)