Worth putting this in an output_handler module?