Homework

Changed some names, and all other changes are commented.