Feature/implement when

Jan Kollars requested to merge feature/implement-when into develop Mar 20, 2020