INCOMPLETE: still need to fix the week periods, rollback