First pass at #373