add
Redners with style, and now keeps track of wha widgets there are.
merged
add
merge
Add in default getData method
merge
Merge branch 'junjun'

* junjun:
  merge
  add
  add
merge
oopsies
some stylig
merging
ohai weird stuff being passed