refactoring from in class
first refactoring from class
fixing merge conflicts
basic model and view added