Added --all to enable as well as disable

 - Also, encapsulated operations and simplified the high level routines