moving analysis code back to single file