Pull request for new functionality

Yay, new functionality!