Working mapping...sort of

Change-Id: I7d05d5abfbe421a445d490f86af629e5c61ba925