Service branch

not exactly what I had in mind, I wanted a service that did the actual calculations but I'll allow this.