Cloth training pants that also work well as diapers?

[gairfowl]

DS is a big 17-month-old who has almost outgrown his one-size cloth diapers. I'd like to get him a few bigger ones, but if possible I'd like some that could also double as trainers when (hopefully soon!) he's ready to potty train. Any recommendations? Ideally I'd like side snaps and either a stuffable pocket or enough built-in absorbancy to work as a real diaper.