Moved keys in song
Added TODO