not much
working on student show
fixed merge conflict