Wip/prepoutput