all
Pretty much finish implementing the new simpler API