Added a bunch of stuff, going to sleep, will work all day tomorrow other than in class