Feature/moar win

commits that are full of win i'm sure you'll agree