Add a TODO to implement it a bit better