Hope I got this.. maybe we should encapsulate this in a separate method?