add multiple property scenarios, bit of a tidy up