Clone Infrastructure - Oatfin

Updated