Prepped for Planets Version 2.0

Changes still need to occur
Merge remote-tracking branch 'origin/master'