Added a bunch of stuff, yo