slight integration progress - putting this to one side for now