Added moment js and month calculations