Major updates

All near final