Hooray for class searching!

Also, prep for boolean logic!