CFY-606 initial commit with working script