ServerChanges-RockyTV

I've split it down to 3 commits so I can actually revert to a commit if there's something wrong.