Seperated analyzer code out into seperate classes