Patch Set 1: Looks good to me, approved; IP review completed

Looks good. In the future, we may want to consider not overloading our Activator with services. We are mixing a lot of concerns currently in our Activator.