First pass at #387