Merged with Simon

Spectator cam etc