Work done on academic year listing, with some refactoring along the way