Finally, a feature-based pull request!

New things to play with! Yay!