Map now works and tests pass.