Merging to close to meeting with Glenda.

Revert "First attempted merge of model and solar system visualization"

This reverts commit 7c05d30e6eb4138db06cd96fc11aa6e6aa0eb3f1.