Added Shapes and SolarSystem position