merging changes with other machine.
got the output parsing and comparison working