Working on paper, streamlined some stats stuff