De-listing

Not for merging yet.
De-listing inside a table.