Fixing my merge conflicts. Rearranged AbstractComputeServices a bit.