issue #321 - factor out more templateable items
issue #312 - part 1 - improve milk/coffee/liquid/container handling