First pass on #308