First early demo candidate
Added first datasource switcher