Updated TODOs to work on this weekend.