stubs almost in place , still some work needed