First (very basic) pass at #451