Removing output.... Created more issues than it solved. Adding functional tests