Initial need to fix nested templates