More playing around with the structure think its right this time