first attempt to integrate wdat into basic UI
Merge branch 'andrey' into wdat2-develop