refactoring, wip weekly view