add types to id hash
more stuff for do()