Awesome stuff from remix, fixing the flipping. And me messing up the merge :)