Finalised service

Now only the client activity is missing