Move most of the container_\* methods (like container_start, container_stop, and so on) from DockerClient to Container. Only those actually creating new Container objects (such as containers(), container_create()) should stay there.