Close to done with v3

more testing needed to be done, esp. w/ api key and channels importing.
also going to rework DataSource to be simpler