I hope I did that right... D^:

I'll be making a CS shortly to be reviewed.