Sandwich is now a proper model and scaffold