functionality done and templates updated