Final Commit

Comments included