Enable/disable logic

/cc @sshillo @mgamba @ciniglio @JarredLHumphrey