Group items + add support for # comments