Partial Update - Will not compile

I have done some of the code, but not all. I am having a lot of issues with Willie, so i will leave that to drtshock or someone else. Most classes should be fixed and/or using the new methods.