Comments are added, need to refactor views and test