Auto enable is still a bit trigger happy. But, bugs worked out, might try a method of detection that uses root...
Will manually merge working product into /master