First pass cosmetic fold-in w/ current app