refactor, and start adding tags-view