First cut at a Tree widget model
Added missing ForWidget annotations