First pass at #232