Once we confirm that it works, it might be a good idea to remove TODOs