Redid a bunch of stuff. Should be fairly invisible