Here's a big ol' pull request :)