With Lesson 7 changes

Maintained old VC, and created new VC with Lesson 7 changes-- also
incorporated some of the old functionality.