Fix --version
Start refactoring
Fix typo
ZOMG TESTS\! It's like a real project now
Beef up the search functionality