First pass at #305