Updated user selections further. Still needs work (update
functionality).