Cleaned system outs. Added TODOs thomas.