Checkpoint before refactoring based on feed viewer MVC.