derped with my last commit - now got rid of the dictionary and optimized the analysys