Add comments and TODOs.