First pass at #84