Started a more client oriented approach (there are TODOs), meaning lighter data transmission from server
Client-oriented approach done. Improvement visible.
Merge branch 'client-oriented'