toying with stacking
done for now
Merging release into master.