planets now draw
Merge origin/master