First pass at #482