added basic planets
fixed merge conflicts with planets