First WSK scaffolding Fixes #1