All the TODOs sprinkled throughout the code!