finished map activity
final map and join refactor