Added CurrentSystem class, Refactoring, lots more.