Singing in the Shower

My two year old now wants to take a shower instead of a bath.  He even jumped in when his dad was in there the other morning... pajamas, diaper, and all.  He plays most of the time and I throw soap on him when I can catch him.  Now to teach him how to wash his own hair...