Moving to Type Script 2