Alot of stuff changed but I like where everything is at right now. I'm going to merge back in and make a new branch.