All the TODOs sprinkled throughout the code!

Log nick changes to the normal log.