complite crew mvc
some other refactoring and etc.