Added a bunch of classes, improved search