Add postamble handling
Deal with error states better.