Added a bunch of stuff again