Added a wrapper, started work on printing and cleaning up output.