Added log, finished off current TODOs