Getting the two file solution working.

It is not even close, but we are getting there.