Added a bunch of stuff apparently