Added rest of TODOs