Big change

Finished assignment