refactored, beginnings of identiy map started.