Worked on String substitution, some front-end work