Pull request for needed functionality

I totally didn't copy paste anything to make the first commit.