Refactored to move dataouthandler to it's own package