First pass at #169