First big update to prediction
Merge pull request #31 from jtleek/jeff

First big update to prediction