Delayed template loading now working. Needs some code cleanup, but works nicely.