added scaffold and final version w/o bootstrap