Add screen mostly works, some bugs, ux kinds of enhancements pending.  Android add screen still an issue