Finished off the logic to disable and enable - w00t complete