Moving vignettes after Uwes noted they weren't stubs anymore