Tastes Controller implementation
Conflicts resolved
Bug fixed after merge