Feature/42 basic courses