Update

Almost ready for release