added more to class. https://app.asana.com/0/15857617978604/16220272163671