Merge in the initial version of ToneGenerator