Better node detection. This is coming together.