I don't think this is needed, and we may be screwing up if we are not careful. We could dave duplicated classes.