Add the server_ts back in.
Merge branch 'master' of github.com:Kegsay/addm