Implemented a bunch of features requested by CSRs