System Software class over.  Moving out of private repo.