Working on Creating Templates Integration