Expansion of StarSystem.java logic