Adding orbit control and stats