Activation key

continueing this in the master