De-listing

Not for merging yet.
Because I hadn't throught through all of the corner cases. Have you?