More work on truck/tank thing.