First pass on filtering nodes and adding command line options