Lots Of Changes

I forgot I had a repo for this.