More WIP on the SDK port.