First pass at #347