First pass at #337