got rid of todo; tested in nitrous