First step in sorting out the activity and situation stores