Fixed my errors. Don't peek at the test code please :shit: