Modularized some more and Stats is working