First pass at #351