changed names
finished initial commenting
finished up