Progress on Base Template