Going through all TODOs marked by @leggetter, could you have a quick review?
Thanks!