EAGLESI-2715: first pass complete