Got everything compiling.  Now time to start fixing unit tests.