First pass at #1007