removed initial observer code
added controller code (last commit messages are exactly the opposite)