First pass at #260