create unified container class
remove old stash class