Closes #5285 // FREEBIE
Closes #5258 // FREEBIE
Closes #5257 // FREEBIE Changes template as per comments