Function centric wizard

Supersedes PR #1305