tests pass, adapter and validator are sorta the same now...hm