Cleaned up TODOs, marked breaking ones