Adding 5-17 impl and tests