think you can write this up as an issue and do away with the TODO