Defun pull request

Pull me in my friends!