First pass at #358