Moving into more structural way of handling things