First pass at #448