@here I've done some work on the prototype following Winston's feedback, and created a revert link, so we can test internally. if all is good I'll update the link Winston has. But please take a look and let me know if I've missed anything or if you have any feedback. Thanks
Original: https://xd.adobe.com/view/e00d3155-c6b0-4440-aa4b-b5d5591d82f9-b55e/grid
Reverts: https://xd.adobe.com/view/e14e4ce5-2c37-4aae-a10b-62a9d35d549f-b41d/grid