Moved around the chooser.
Merge branch 'master' of https://github.com/mothertheresa/BWhackathon