Expanded node definitions, bugged heirarchy creation.