Further work on Services and controllers