I had multiple fields on this wrong, add comment support and tests to ensure everything is still ship shape.