First pass at #382