Update - introduces array broadcasting - still to add unit test