made a lot of cool changes i'm awesome
preparing for merge