Removed defunct class
Added ability to capture stdout output