EAGLESIX-2716: still some things to iron out