Spectator Update

Had to remove the fancy new spec stuff