this is ok for now, but I rather see this endpoint stuff end up being defined with the Services library.