Some more work on getting sets working