Work on suggestions
Progress on suggestions