Wayward branch

Pull request while driving. What a way to die.