Interface update

NEXT: Replace old objects and drive to 100% test pass