Change all TODO to be tags for yard