Adaptor newer

Passes all tests now. Open for feedback.