added new TODOs removed old TODOs. added token url variable, starting standalone testing now