More work on OutputFormatter, still messy