Removing TODO markers now that I've added a few github issues.