New class search feature

Not as far along as I had hoped, but all the hard stuff is working