Finished Reviewers Comments... TODO Full Revision