Start implementing tones; some cleanup