pull request about to be sent

Hey! Review my changes.