Updated TODOs
Initial commit of output work.
Output to file now working.