Reworked client controller, merged to main project
Merge remote-tracking branch 'origin/master'