Been awhile since my last commit. I'm changing a bunch of stuff. Don't mind
me.