Continued typescript conversion