Added 83 TODOs along with a start of the rewrite of logs