Wire up CfP (fixes #136)