Get 'pouring' working through the whole stack

Took more changes than I expected, but does work.