Moved analysis into new file