added mapping, starting to get results