Many changes. refs #6