First pass at #307