Add header class and other changes to support ordering and glorify stdout messages