Added scaffold
Check everything