Adding the actual class that now includes the activation stuff.