Sub-Class and Instance fix

Added the ability to add sub classes and
fixed an instance bug - if only one org was not checking for multiple
instances