shops and  toDo
Revert "shops and  toDo"

This reverts commit 8601686d9b36165a11e4bef9af25fff896616478.