School year redo

There are a few other commits done before, I guess the reason is I did not updated them in add-bulkOperation branch, but they won't affect anything.