Updated TODO w/ Next Steps
Fixed problem with tokenized strings