removed coffees and added some scaffolding