Started working on Date and String substitution