First pass at #290