Refactored, added PatronSearch, etc.