#1016 - not quite working yet...