significant work on classes & visitors