Added a whole butt ton of stuff