more work on context props