cal complete except for some testing