Merge David and Vice-Pré branch #2

Modified server / monitor / client structures and the way they work.
Yes I know this is pretty vague but I don't care