Finalized all the code, commenting. Ready to be Merged with Master Branch