More wx finder work