WIP: use correct output stuff.