Added NewInheritanceHandler. Cleaned up existing code; more to come.