updates testing and sample
refactored, beginnings of identiy map started.