Finished all but 2 of Aaron's comments.