First pass, using service checks
More cleanups