I changed a bunch of stuff and the old tests are working so I just want to push this