Finish implement adapter and API design. Testing (simple)