Adds comments from Nick Hong

Had some merge conflicts - didn't want to push onto master :)