Also to add to your post:

We have an old (but in great shape) oil drain on wheels that we mounted a fuel pump and a switch. We use a ground strap and transfer the fuel to this and back. We charge .3 extra on each job for drain and refill. Makes life much eas... Login to read more.