Starting to work on suggestion handling