preliminary implementation
Merge remote-tracking branch 'origin/master' into picksource
updates, insert works now