A reworking of the HotDrink library with a simplified implementation.