Add gravity well object definition, refactor