More work on coffee gen