Started updating TODOs to reflect current state