Added fun with maps

Change-Id: I7581d02b0fc204c79711383b5a23affabcd6c398