Tested and looks good. Keeping on with the templates