More work and testing