initial add
hook up controller
Merge branch 'release/1.0'