Incorporated Martin's TODOs