Initial merger with Activities framework (will eventually go into patterns)