First pass at #254