2nd Commit

Going to collage, I'll be back in 4 - 5 hours ish