I think this TODO belongs above the new methods.