Progress on custom templates