Add more features/tests.