New code now passes unit test, more testing needed