Minimal feature set now passing tests.