Last minute update

Nearly everything's changed