First pass at #316