Converting everything to coffee
Merged with upstream