Feature/uncoffeeify