Partial commit .. added maps and test code