finished the homework

Works but so far no tests are up