Messing around with the design. Need to wait for Fabio's mock ups