merged the branches.

Get/put and panic implementation still missing, for now just commented
out relevant places. probably other untested problems as well.