added more to the class https://app.asana.com/0/15833644813536/16220272163673