moved some stuff over to the new api . . . it's ok.