added template inheritance and added Regex manipulation to dates