Update on changes made.

Filled in a couple of classes