Put in checks for node, need to test with clean systems