EAGLESIX-812: initial stab at updating top level API