Added basic scaffold