Changed so we use frand and removed includes from hpp file