Adding some TODO notes about potential race conditions.