Some more work on #1