Started putting the music stuff together.  Simplified the leap stuff