First pass at issue #60