Readded a TODO referencing github issues