commented code, added base code, and commented all code
manual merge