Some implemenations
Merge branch 'development' of https://github.com/gbssg/train-project-gr2 into development