Added first pass at comment markup
Using profile.displayName in refactored template