refs #132, safekeeping checkin into branch