ActivityMap is now a class (#16)