Added orbiting and cleaned up