Wasn't as straight forward as initial commit would have suggested.