More work on unbind model: WIP