Feedback faves and flags

Merging fave/flag stuff into feature branch.