progress on last test, beginning refactoring