Starting to work the unit builds.

Not sure how to instantiate the classes in the functions.