Almost implemented Disable and some supporting infrastructure... will finish tomorrow