Add more flags, make it easier to test it.