Yet another read-through, still resolving the software/services split