Started implementing negotiating bevaviour, added UIDs to item descriptor
Hopefully resolved merge conflicts