UnReverted "Cleaned up joining server"

Still getting to grips with Git, go figure.