Updated todo's based on call w/Paul