Added crap ton of stuff, nearing finish