commented out a bunch of stuff i'm not actually using