extended planet class, functions etc
Merge origin/master