Revert "Revert "CoffeeAdvisor""

This reverts commit 4918ccce3166ab914ab3f95d0666a6d081865490.