Merge "Implementing class to play tones" into nyc-dev