major refactor of course list