Added a bunch of stuff, test still not working