refactoring to scaffolds - still buggy
AG-1 #close reorganized all the scaffolds using the new api