Move analysis into separate view