Spectator feature

Merging the Spectator feature into the master branch