Making progress, I think I’ve finalised the style now