added date spec and parts of calc spec
 merge