WIP: Finish pull request

TODO: Add description of pull request.