Cargo shipped mostly complete.

Might need tweaks for performance.