Many many changes from last classes of OneMonthRails