abigaildebusk: Some more work in progress.