[WIP] Fix ht interface

Resubmit from #105 onto master
See #108 - I would like to keep the `_del` functions.