Replaced lists with dictionary; working.

Still need to make it work better with other courses.