Template System Update

Added reparse function