Added closing paren and TODOs