Plastic cup changes

initial PR (don't merge)