! major changes, refactoring and new view handling/controlling