Complete output parsing, pending testing