Incomplete work on making output stuff not broken