refectored. Need to fix solarsystem