Adding in ability to enable and disable systems