WIP. Not sure why Deleted entries are not handled on output