Updates

finishing up, just a few tests.