Moving to typescript