Modified version and began refactoring netlist parser