First draft for review
Add commas, remove extender lines, add dynamic year