Untested version of the scaffolder