Initial view and test models
Bugfixes