Needed to account for spaces for comments, need to do the other