More completed work on the MBR templates