CR for #40 - Keg State implementation