First version of csMap
Fix merge conflicts