Added a crap ton of new stuff