Came here to say exactly the same. Just needs some typescript into the mix.