Added tracking node parents, added more debug output
Actually get the previous change working