* Added some notes for this later
* Got disable working