some more additions...doing more work later.