updated TODO
allow for "-" and "_" in function names