Rework intro

@pbauer Ready for review