Stacks

fix for premature merge of #367