added unitofwork and supplementing methods / still not working