Support older services
I am am moron
Better errors.
Tests for failure and edge conditions.