First pass at #68