Added basic controller implementation and tests