ontinued work toward unit tests2