Seems to work fine now, one last TODO