First pass at #192