still wip, but looking promising for hub-2!