Got rid of checks for format of output from commands as it's just a ball-ache to maintain and the proof is in the eating.