And there was much rejoicing! (yay)