basic implementation map and cell, refectored ItemHolder to generic Container
merged origin/dev into dev