Added Scaffold Classes
Scaffolding Changes, Got distracted, No useful progress