Increased clarity of pred/stat separation

Separation of these functions into separate plugins is an inevitability, but not today. I reopened this today and noticed it doesn't match github. To be honest I don't even know what does and doesn't work. Continued testing, bug fixing, and code generation to follow Soon™.