minimal changes
some progress in the view. Added test skeleton and some refactoring
merge conflict fix