Adding 4-8 impl and test