TODO dataset stuff
Tidied up bulk update/insert