First pass at #381