Use activation list. This fixes #19 and sets the stage for adding conflict resolution.