First pass at #319