First checkin with tests for asMap