Fix api to match update from upstream
Add some serial code.

Compiles, but missing some implementations