Checking in refactored, working Janice code.