Pull code into controller.
Add tests.
Merge branch 'bugfix-meal-planning-4'
Remove commented code.