Add Map and some item/items changes.
Don't override attribute names.
whoops
more fixes and notes