Client refactoring
View refactoring
Comm refactoring