Trying to get TS working.. almost there