first pass at new service
more updates