Rewrite make_compatilble... and add tests for lookup