First pass at #417