Update

This is me trying to update my fork with the changes you guys made. If it's working how I want it to, you will never see this.