Reset to older branch as many changes got reset (by accident? don't force push!). Advancement on map implementation.