Refactored the basic systems to provide a cleaner interface and remove the public class member.