Adding first code commit.  Map seems to work, needs tests.