switched from lists to dictionaries

switched from lists to dictionaries for inner key/values
Merge remote-tracking branch 'origin/teacher-edge' into teacher