Initial activityID refactoring. Includes new contexts as well