Finished commenting code and cleaning it up… fully tested