commiting

locations working. Activity if statements not