My Sweet Changes for Jeff to Pick up

I think this might get messy if you attempted to merge everyone's changes into your branch.