Moved the output in to it's own class