First pass at #291