Now working, except for multi-file deletes. Ready for number tests