Construct 2 Templates

Updates