Updated a lot of things.  Should be close to done now