Major update

Nearly everything changed