Also, I would refactor to order of the elements here to reflect our implementation, even if the specs pass.