Making a feature branch.

Merging in some shiny new stuff.