Added a bunch more stuff I'm sorry this commit comment sucks