Re-wrote some things I accidentally deleted
Finished assignment