Class list bug
Class list Academic for default
merging with dev
adding give now