Added empty unit tests.  Reworked some logic.