added map
switched to using closure dependencies
all tests pass, for my runtime