Services revision started
Updates to new API. SOme testing remains