Adding rainbow and lilypond stuff
Moving some stuff around