More changes, almost ready to go online!