First pass at #278