Write more tests, implement -t, implement --json
Work on auto-discovery