course catalog interface
finished merge