#8 ViewModel in progress
#6 Code review
#6 unused files removed