nearly there with the scala upgrade