Begun moving to Typescript